Merge remote-tracking branch 'upstream/master'

diff --cc src/bin/bench.rs
Simple merge

diff --cc src/bin/test.rs
Simple merge

diff --cc src/cargo/ops/cargo_run.rs
Simple merge